Move cet/cet_util out of defs.h and into files where it's actually used.

(Not all of which I'm convinced it's actually _needed_...)

diff --git a/gpsbabel/compegps.cc b/gpsbabel/compegps.cc
index 8badb4e97363d8e621cf6cf6bc878af31c98f7f9..d367aa0fc2d317b3b7cfc0fe512d439f51a3eab0 100644 (file)
--- a/gpsbabel/compegps.cc
+++ b/gpsbabel/compegps.cc
@@ -57,6 +57,7 @@
 */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 
 #if CSVFMTS_ENABLED

diff --git a/gpsbabel/cst.cc b/gpsbabel/cst.cc
index dbcddde4e80c60c1b67ab4e4fe3f552967ca3614..e307db2a7b0ea2262a4dae646fa184303862f70f 100644 (file)
--- a/gpsbabel/cst.cc
+++ b/gpsbabel/cst.cc
@@ -21,6 +21,7 @@
 
 
 #include "defs.h"
+#include "cet_util.h"
 #include "strptime.h"
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/gpsbabel/csv_util.cc b/gpsbabel/csv_util.cc
index 2aa5ed4b7e6de7a71dfa2e99f2538285c317f2a8..3aeb2fc90952befa800925bcaa4c6808733b2696 100644 (file)
--- a/gpsbabel/csv_util.cc
+++ b/gpsbabel/csv_util.cc
@@ -23,6 +23,7 @@
 #include <QtCore/QRegExp>
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include "garmin_fs.h"
 #include "grtcirc.h"

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 52df64c1a264041637dc8ea014f2cf09394d9b44..16ced996b336f1988f89ac3667195bfe0aaca004 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -31,8 +31,6 @@
 #include "zlib/zlib.h"
 #endif
 #include "gbfile.h"
-#include "cet.h"
-#include "cet_util.h"
 #include "inifile.h"
 #include "session.h"
 

diff --git a/gpsbabel/f90g_track.cc b/gpsbabel/f90g_track.cc
index d7a314788ddcb489c6a6b52027b2942b0a78b01b..08f7b00e58976dd8b1a871d2cbf668cc5069485d 100644 (file)
--- a/gpsbabel/f90g_track.cc
+++ b/gpsbabel/f90g_track.cc
@@ -27,6 +27,7 @@
  */
 
 #include "defs.h"
+#include "gbfile.h"
 #include <QtCore/QDebug>
 
 #define MYNAME "f90g_track"

diff --git a/gpsbabel/g7towin.cc b/gpsbabel/g7towin.cc
index 24d1ea8f882c23d0a4ccfa58f0a832017e5b8d21..db6de36dd1d06a3220c4a00b5366d3beaccbd3fb 100644 (file)
--- a/gpsbabel/g7towin.cc
+++ b/gpsbabel/g7towin.cc
@@ -26,6 +26,7 @@
 
 #include "defs.h"
 #include "csv_util.h"
+#include "cet_util.h"
 #include "garmin_fs.h"
 #include "garmin_tables.h"
 #include "jeeps/gpsmath.h"

diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc
index b18195c93bacafe655e9beda448cfd90fa7276d0..5e91028517f271b797c27ddf0f6d2a46943d73a4 100644 (file)
--- a/gpsbabel/garmin.cc
+++ b/gpsbabel/garmin.cc
@@ -25,6 +25,7 @@
 #include <math.h>
 
 #include "defs.h"
+#include "cet_util.h"
 #include "grtcirc.h"
 #include "jeeps/gps.h"
 #include "jeeps/gpsserial.h"

diff --git a/gpsbabel/garmin_fs.cc b/gpsbabel/garmin_fs.cc
index de3b01bb3ff3a834cc44a1cd4b9886f9d5876fd3..dc5df1be3431c1a500969c280496306e8de6139e 100644 (file)
--- a/gpsbabel/garmin_fs.cc
+++ b/gpsbabel/garmin_fs.cc
@@ -21,6 +21,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "garmin_fs.h"
 #include "garmin_tables.h"
 #include "inifile.h"

diff --git a/gpsbabel/garmin_txt.cc b/gpsbabel/garmin_txt.cc
index eb79573ea5c491651fb8368807a9618ca8194089..182c88a61552ed3a7cc341e4ad58c9f4b4093c75 100644 (file)
--- a/gpsbabel/garmin_txt.cc
+++ b/gpsbabel/garmin_txt.cc
@@ -23,6 +23,7 @@
 #include "defs.h"
 
 #if CSVFMTS_ENABLED
+#include "cet_util.h"
 #include "csv_util.h"
 #include "garmin_fs.h"
 #include "garmin_tables.h"

diff --git a/gpsbabel/gbfile.cc b/gpsbabel/gbfile.cc
index a750a2f01989c0ca7ba30f5762235d58e6b003a2..fcb05e3c52b9ffc588986eeaba7d592443cec124 100644 (file)
--- a/gpsbabel/gbfile.cc
+++ b/gpsbabel/gbfile.cc
@@ -492,7 +492,7 @@ memapi_error(gbfile* self)
  */
 
 gbfile*
-gbfopen(const char* filename, const char* mode, const char* module)
+gbfopen(const QString filename, const char* mode, const char* module)
 {
   gbfile* file;
   const char* m;
@@ -537,7 +537,7 @@ gbfopen(const char* filename, const char* mode, const char* module)
     file->filewrite = memapi_write;
   } else {
     file->name = xstrdup(filename);
-    file->is_pipe = (strcmp(filename, "-") == 0);
+    file->is_pipe = (filename == "-");
 
     /* Do we have a '.gz' extension in the filename ? */
     len = strlen(file->name);
@@ -600,7 +600,7 @@ gbfopen(const char* filename, const char* mode, const char* module)
  */
 
 gbfile*
-gbfopen_be(const char* filename, const char* mode, const char* module)
+gbfopen_be(const QString filename, const char* mode, const char* module)
 {
   gbfile* result;
 

diff --git a/gpsbabel/gbfile.h b/gpsbabel/gbfile.h
index e92c75db446b9d4fdb0ce48854d07c6db96f0136..0a69a0bc5df38263de4e6496b179748b42076809 100644 (file)
--- a/gpsbabel/gbfile.h
+++ b/gpsbabel/gbfile.h
@@ -86,8 +86,8 @@ typedef struct gbfile_s {
 } gbfile_t;
 
 
-gbfile* gbfopen(const char* filename, const char* mode, const char* module);
-gbfile* gbfopen_be(const char* filename, const char* mode, const char* module);
+gbfile* gbfopen(const QString filename, const char* mode, const char* module);
+gbfile* gbfopen_be(const QString filename, const char* mode, const char* module);
 #define gbfopen_le gbfopen
 void gbfclose(gbfile* file);
 

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index 35bd0780b8d46ced24cac58d5a5e1685da85c25e..ce463eb841a16696e83bd3be93ee95634cde0958 100644 (file)
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -23,7 +23,7 @@
 
 #include "defs.h"
 
-#include "cet.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include "garmin_fs.h"
 #include "garmin_tables.h"

diff --git a/gpsbabel/ggv_ovl.cc b/gpsbabel/ggv_ovl.cc
index 7e08fb922ff00055c1b671e9a10a46a8ba677840..da45bcdc3e9e51320d746a9d618aa99116fb3d83 100644 (file)
--- a/gpsbabel/ggv_ovl.cc
+++ b/gpsbabel/ggv_ovl.cc
@@ -21,6 +21,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "inifile.h"
 #include "grtcirc.h"
 

diff --git a/gpsbabel/gopal.cc b/gpsbabel/gopal.cc
index ef760c7440e5b7c9b80c38fff7ee5fc1c1b7d88a..dcda8f7a29ae9931108adf1250eb15ff0930db94 100644 (file)
--- a/gpsbabel/gopal.cc
+++ b/gpsbabel/gopal.cc
@@ -49,6 +49,7 @@
 */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include "strptime.h"
 #include "jeeps/gpsmath.h"

diff --git a/gpsbabel/gpsutil.cc b/gpsbabel/gpsutil.cc
index c7768e9d8af653d8df97fa687e7cf30a5dd402f4..8dadf170ec64b9357b3234f511e46cb44d91878f 100644 (file)
--- a/gpsbabel/gpsutil.cc
+++ b/gpsbabel/gpsutil.cc
@@ -21,6 +21,7 @@
 
 
 #include "defs.h"
+#include "cet_util.h"
 #include "magellan.h"
 #include <cmath>
 #include <stdio.h>

diff --git a/gpsbabel/igc.cc b/gpsbabel/igc.cc
index 3035ff58225abe8b8f8e362850cc2344d8039850..1ad76f2e0a214a2c0a2c77f522b4fc952f1a702d 100644 (file)
--- a/gpsbabel/igc.cc
+++ b/gpsbabel/igc.cc
@@ -24,6 +24,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include <errno.h>
 #include <math.h>
 #include <stdio.h>

diff --git a/gpsbabel/netstumbler.cc b/gpsbabel/netstumbler.cc
index 02771f1723717be8c03c822505761bf40ad0cd11..b60b8f4b7cf723c91bc36f521d4f454ed6cfc35f 100644 (file)
--- a/gpsbabel/netstumbler.cc
+++ b/gpsbabel/netstumbler.cc
@@ -21,6 +21,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include <ctype.h>
 #include <stdlib.h>

diff --git a/gpsbabel/nmea.cc b/gpsbabel/nmea.cc
index 905b17ff7348d7472a38e9fd4f4b101701d61bd4..09ef42f8533f637c8808cb114412655054b90a8f 100644 (file)
--- a/gpsbabel/nmea.cc
+++ b/gpsbabel/nmea.cc
@@ -22,6 +22,7 @@
 
 
 #include "defs.h"
+#include "cet_util.h"
 #include "gbser.h"
 #include "strptime.h"
 #include "jeeps/gpsmath.h"

diff --git a/gpsbabel/nmn4.cc b/gpsbabel/nmn4.cc
index caba925092fc6f70e6edfd35271a1ca0ce403415..41f5b8294368b653ba7f8e6e7b2446c9385b096b 100644 (file)
--- a/gpsbabel/nmn4.cc
+++ b/gpsbabel/nmn4.cc
@@ -27,6 +27,7 @@
 */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include <ctype.h>
 #include <stdio.h>

diff --git a/gpsbabel/ozi.cc b/gpsbabel/ozi.cc
index dfcb3103ecb9447b8614968f177769c861e30015..2786a8117d85e94f95f1d012a0130324b51ac089 100644 (file)
--- a/gpsbabel/ozi.cc
+++ b/gpsbabel/ozi.cc
@@ -23,6 +23,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include "jeeps/gpsmath.h"
 #include <ctype.h>

diff --git a/gpsbabel/pcx.cc b/gpsbabel/pcx.cc
index 14ce3766f1338eeebe479b0ae787f839495a3feb..c0049acf77f6b6dbacc19b1023b292ff95216ffc 100644 (file)
--- a/gpsbabel/pcx.cc
+++ b/gpsbabel/pcx.cc
@@ -22,6 +22,7 @@
 
 #include "defs.h"
 #include "garmin_tables.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include <math.h>
 #include <stdlib.h>

diff --git a/gpsbabel/raymarine.cc b/gpsbabel/raymarine.cc
index eee63d622f4c21578bb3bc6a86a7fe9f8a5182c4..59fada1bea17070efcdf0e44b21d6c5354f74627 100644 (file)
--- a/gpsbabel/raymarine.cc
+++ b/gpsbabel/raymarine.cc
@@ -44,8 +44,9 @@
 */
 
 #include "defs.h"
-#include "inifile.h"
+#include "cet_util.h"
 #include "csv_util.h"
+#include "inifile.h"
 
 #include <ctype.h>
 #include <stdio.h>

diff --git a/gpsbabel/stmsdf.cc b/gpsbabel/stmsdf.cc
index f5f01f03bde8891b8a5894f4f9f5a91b3cc5dde8..29d173ffb4533148ab08485491a2724d4a930625 100644 (file)
--- a/gpsbabel/stmsdf.cc
+++ b/gpsbabel/stmsdf.cc
@@ -31,6 +31,7 @@
 
 #if CSVFMTS_ENABLED
 
+#include "cet_util.h"
 #include "csv_util.h"
 #include "strptime.h"
 #include "jeeps/gpsmath.h"

diff --git a/gpsbabel/stmwpp.cc b/gpsbabel/stmwpp.cc
index 4b77abc07319a5c70b7140261020b4a5decab42c..3097bd72fa3615329c9a7e2d079da1667da3dc2f 100644 (file)
--- a/gpsbabel/stmwpp.cc
+++ b/gpsbabel/stmwpp.cc
@@ -26,6 +26,7 @@
 #if CSVFMTS_ENABLED
 
 #include "csv_util.h"
+#include "cet_util.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/gpsbabel/tiger.cc b/gpsbabel/tiger.cc
index 2921d425459bee1bb04b1aff7417b576e83d1368..32e187366ee1ef90aa36abb4e2d5913a9db4d4e2 100644 (file)
--- a/gpsbabel/tiger.cc
+++ b/gpsbabel/tiger.cc
@@ -20,6 +20,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include <math.h>
 #include <stdio.h>

diff --git a/gpsbabel/tmpro.cc b/gpsbabel/tmpro.cc
index b60d1630868df64a9d0ccb2ed2de1e69ab3b1ff5..26c5fb7818482e7eb95708ac4e3b0626ac211977 100644 (file)
--- a/gpsbabel/tmpro.cc
+++ b/gpsbabel/tmpro.cc
@@ -33,6 +33,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include <stdlib.h>
 

diff --git a/gpsbabel/unicsv.cc b/gpsbabel/unicsv.cc
index aa8c030f315b1f6fe22c47aabd9de268bf53ba69..0ba5c85f3a92af978fa5889e4cd6f3c8e69c2dad 100644 (file)
--- a/gpsbabel/unicsv.cc
+++ b/gpsbabel/unicsv.cc
@@ -21,6 +21,7 @@
 
 #include "defs.h"
 #include "cet.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include "garmin_fs.h"
 #include "garmin_tables.h"

diff --git a/gpsbabel/xcsv.cc b/gpsbabel/xcsv.cc
index 365df6584436dfb68f25b7df86bba2c483b2b1a7..8b2e65581b336f81c667c598bb8a17cf98dcbaf9 100644 (file)
--- a/gpsbabel/xcsv.cc
+++ b/gpsbabel/xcsv.cc
@@ -24,6 +24,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "csv_util.h"
 #include "jeeps/gpsmath.h"
 #include <ctype.h>

diff --git a/gpsbabel/xmltag.cc b/gpsbabel/xmltag.cc
index 22578f5261d6cf9c311f7eb439c4a9110a958dc7..ef71928e7ae93a608bfa18caa405aceb270fcca7 100644 (file)
--- a/gpsbabel/xmltag.cc
+++ b/gpsbabel/xmltag.cc
@@ -20,6 +20,7 @@
  */
 
 #include "defs.h"
+#include "cet_util.h"
 #include "src/core/xmltag.h"
 #include <stddef.h>
 #include <stdio.h>